bitkeeper revision 1.1657 (429fb3bdy_w-Djv7N3uJ1qp_Sdc2cQ)

domain.h, xenmem.c, mkbuildtree, slab.h, setup.c:
  Fix ia64 build.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/.rootkeys b/.rootkeys
index 4f79a0d0c70bfce792a3f201f148a49380e8b15f..a98c77a58fbc9bca0c45b378567ff6786eee751d 100644 (file)
--- a/.rootkeys
+++ b/.rootkeys
@@ -1275,6 +1275,7 @@
 421098b7Z6OwjZnrTZkh34DoDfcjrA xen/include/asm-ia64/regionreg.h
 421098b707cY5YluUcWK5Pc-71ETVw xen/include/asm-ia64/regs.h
 4214e2f3fbO_n9Z1kIcBR83d7W4OJw xen/include/asm-ia64/serial.h
+429fb3bc53qJOyKJCBfhDNmTasj8Gw xen/include/asm-ia64/slab.h
 421098b7GkWOnlzSmPvNAhByOSZ1Dw xen/include/asm-ia64/time.h
 421098b7FK3xgShpnH0I0Ou3O4fJ2Q xen/include/asm-ia64/tlb.h
 421098b78IGdFOGUlPmpS7h_QBmoFg xen/include/asm-ia64/vcpu.h

diff --git a/xen/arch/ia64/patch/linux-2.6.11/setup.c b/xen/arch/ia64/patch/linux-2.6.11/setup.c
index 07c9d382a4f2415d00a7914af420ecb184dce5d7..e7bc927d7d1f9824a67787326606c477cfa3c340 100644 (file)
--- a/xen/arch/ia64/patch/linux-2.6.11/setup.c
+++ b/xen/arch/ia64/patch/linux-2.6.11/setup.c
@@ -1,12 +1,13 @@
 --- /home/adsharma/disk2/xen-ia64/xeno-unstable-rebase.bk/xen/../../linux-2.6.11/arch/ia64/kernel/setup.c      2005-03-01 23:37:49.000000000 -0800
 +++ /home/adsharma/disk2/xen-ia64/xeno-unstable-rebase.bk/xen/arch/ia64/setup.c        2005-05-18 12:40:50.000000000 -0700
-@@ -51,6 +51,9 @@
+@@ -51,6 +51,10 @@
  #include <asm/smp.h>
  #include <asm/system.h>
  #include <asm/unistd.h>
 +#ifdef CONFIG_VTI
 +#include <asm/vmx.h>
 +#endif // CONFIG_VTI
++#include <asm/io.h>
  
  #if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE)
  # error "struct cpuinfo_ia64 too big!"

diff --git a/xen/arch/ia64/tools/mkbuildtree b/xen/arch/ia64/tools/mkbuildtree
index 15a6d937cab54a3777627f8991b74278ee5143c6..c88b9841b99bba222f523eb7ced0468f8626feb3 100644 (file)
--- a/xen/arch/ia64/tools/mkbuildtree
+++ b/xen/arch/ia64/tools/mkbuildtree
@@ -48,6 +48,7 @@ mkdir include/asm-ia64/linux/byteorder
 # use "gcc -Iinclude/asm-ia64" to find these linux includes
 #ln -s $XEN/include/xen $XEN/include/linux
 #ln -s $XEN/include/asm-ia64/linux $XEN/include/asm-ia64/xen 
+ln -s ../slab.h include/asm-ia64/linux/slab.h
 
 # prepare for building asm-offsets (circular dependency)
 #echo '#define IA64_TASK_SIZE 0' > include/asm-ia64/asm-offsets.h

diff --git a/xen/arch/ia64/xenmem.c b/xen/arch/ia64/xenmem.c
index a009037b90bb31a904edaab48099da60027b96a7..6939fb4296980b17ff7ed0d71fbfd670926a7e12 100644 (file)
--- a/xen/arch/ia64/xenmem.c
+++ b/xen/arch/ia64/xenmem.c
@@ -11,6 +11,7 @@
 
 #include <linux/config.h>
 #include <asm/pgtable.h>
+#include <asm/mm.h>
 
 extern struct page *zero_page_memmap_ptr;
 struct pfn_info *frame_table;

diff --git a/xen/include/asm-ia64/domain.h b/xen/include/asm-ia64/domain.h
index 3365e1e08cb486dde8138ce25afd7b06d4b2fc31..6481257eb420bfaabda8c7f3c2b0b1fc62173399 100644 (file)
--- a/xen/include/asm-ia64/domain.h
+++ b/xen/include/asm-ia64/domain.h
@@ -7,6 +7,7 @@
 #include <asm/vmmu.h>
 #include <asm/regionreg.h>
 #endif // CONFIG_VTI
+#include <xen/list.h>
 
 extern void arch_do_createdomain(struct vcpu *);
 

diff --git a/xen/include/asm-ia64/slab.h b/xen/include/asm-ia64/slab.h
new file mode 100644 (file)
index 0000000..a3239a4
--- /dev/null
+++ b/xen/include/asm-ia64/slab.h
@@ -0,0 +1,3 @@
+#include <xen/xmalloc.h>
+#include <linux/gfp.h>
+#include <asm/delay.h>